Updates

svn path=/trunk/; revision=20243

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index ae5f8158a918d7ed26d3a916cb16f7872f5c28d9..f6352db2f4f6885e33bb983138620f4a5bf9355f 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/building.sgml: Document added configure options
+
 2008-05-29  Michael Natterer  <mitch@imendio.com>
 
        * gtk/Makefile.am (CPPFLAGS): add -UGTK_DISABLE_SINGLE_INCLUDES so

diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index 82362fd8957665ed6c50c2100c559c33b1ceee22..d5f494a5efcb56ff3536fa7b2f06c20791f2f805 100644 (file)
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -170,7 +170,7 @@ How to compile GTK+ itself
          The GLib library provides core non-graphical functionality
          such as high level data types, Unicode manipulation, and
          an object and type system to C programs. It is available
-         from the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+
+         from the <ulink url="ftp://ftp.gtk.org/pub/glib/">GTK+
          FTP site.</ulink>
        </para>
       </listitem>
@@ -178,7 +178,7 @@ How to compile GTK+ itself
        <para>
          <ulink url="http://www.pango.org">Pango</ulink> is a library
          for internationalized text handling. It is available from
-         the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP
+         the <ulink url="ftp://ftp.gtk.org/pub/pango/">GTK+ FTP
          site.</ulink>. 
        </para>
       </listitem>
@@ -188,7 +188,7 @@ How to compile GTK+ itself
          interfaces allowing accessibility technologies such as
          screen readers to interact with a graphical user interface.
          It is available from the <ulink
-         url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP site.</ulink>
+         url="ftp://ftp.gtk.org/pub/atk/">GTK+ FTP site.</ulink>
        </para>
       </listitem>
       <listitem>
@@ -309,6 +309,9 @@ How to compile GTK+ itself
          <group>
            <arg>--with-included-loaders==LOADER1,LOADER2,...</arg>
          </group>
+         <group>
+           <arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
+         </group>
          <group>
            <arg>--enable-debug=[no|minimum|yes]</arg>
          </group>
@@ -340,6 +343,10 @@ How to compile GTK+ itself
            <arg>--disable-gtk-doc</arg>
            <arg>--enable-gtk-doc</arg>
          </group>
+         <group>
+           <arg>--disable-cups</arg>
+           <arg>--enable-cups</arg>
+         </group>
           <group>
             <arg>--with-xinput=[no|yes]</arg>
           </group>
@@ -377,6 +384,15 @@ How to compile GTK+ itself
        </para>
       </formalpara>
 
+      <formalpara>
+       <title><systemitem>--with-included-immodules</systemitem></title>
+
+       <para>
+         This option allows you to specify which input method modules you
+         want to include. 
+       </para>
+      </formalpara>
+
       <formalpara>
         <title><systemitem>--enable-debug</systemitem></title>
           
@@ -512,6 +528,18 @@ How to compile GTK+ itself
        </para>
       </formalpara>
 
+      <formalpara>
+       <title><systemitem>--disable-cups</systemitem> and
+         <systemitem>--enable-cups</systemitem></title>
+
+       <para>
+          By default the <command>configure</command> script will try
+          to build the cups print backend if the cups libraries are found.
+          These options can be used to explicitly control whether
+          the cups print backend should be built.
+        </para>
+      </formalparap>
+
       <formalpara>
         <title><systemitem>--with-xinput</systemitem></title>
         <para>